Improvements in stmwpp for NEW_STRINGS.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4650 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/stmwpp.cc b/gpsbabel/stmwpp.cc
index 303a2cdbb8d1781d6ed837d4f41e334e46026e61..e551c7aac4f7f9fc73821095be80c6721fffe037 100644 (file)
--- a/gpsbabel/stmwpp.cc
+++ b/gpsbabel/stmwpp.cc
@@ -135,7 +135,11 @@ stmwpp_data_read(void)
         break;
 
       case 2:
+#if NEW_STRINGS
+        wpt->shortname = QString::fromLatin1(c);
+#else
         wpt->shortname = xstrdup(c);
+#endif
         break;
 
       case 3:
@@ -246,8 +250,8 @@ stmwpp_waypt_cb(const waypoint* wpt)
   snprintf(cdate, sizeof(cdate), "%02d/%02d/%04d", tm.tm_mon, tm.tm_mday, tm.tm_year);
   snprintf(ctime, sizeof(ctime), "%02d:%02d:%02d", tm.tm_hour, tm.tm_min, tm.tm_sec);
 
+  QString sn;
   switch (what) {
-    char* sn;
 
   case STM_WAYPT:
   case STM_RTEPT:
@@ -256,8 +260,7 @@ stmwpp_waypt_cb(const waypoint* wpt)
     } else {
       sn = mkshort(short_h, wpt->shortname);
     }
-    gbfprintf(fout, "WP,D,%s,", sn);
-    xfree(sn);
+    gbfprintf(fout, "WP,D,%s,", CSTR(sn));
     break;
 
   case STM_TRKPT: